Add network constraints for fetching notifications with `WorkManager` by jmartinesp · Pull Request #6305 · element-hq/element-x-android

jmartinesp · 2026-03-09T15:25:57Z

Content

Add isNetworkBlocked and isInAirGappedEnvironment to NetworkMonitor, which are populated from NetworkCallback. We can remove NetworkBlockedChecker now.
Improve the DI of SyncPendingNotificationsRequestBuilder so we use assisted injection now and don't have to add its dependencies to the instantiator.
Expose the air-gapped state in EnterpriseService.isInAirGappedEnvironment.
Use that to decide if we should add the NetworkCapabilities.NET_CAPABILITY_VALIDATED constraint to the notification fetching workers (which checks Google's 204 endpoints to know if the network has internet connectivity).
Add a feature flag to disable this behaviour.

Motivation and context

Part of #6209.

Tests

Things that can be checked:

There should be logs for network being disabled when the app goes to background for a while, and of it being enabled when bringing it back to foreground. This means the callback works as the checker did before.
If you set up a MITM proxy and block https://www.google.com/generate_204 and http://connectivitycheck.gstatic.com/generate_204, your device will display your network not having internet connectivity, and the app should know it's in an air-gapped env. If using this you receive a notification, it should still be fetched.
If for any reason it didn't, disabling the new feature flag and testing it again should make it work as expected.

Tested devices

Physical
Emulator
OS version(s): 16

Checklist

Changes have been tested on an Android device or Android emulator with API 24
UI change has been tested on both light and dark themes
Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility
Pull request is based on the develop branch
Pull request title will be used in the release note, it clearly define what will change for the user
Pull request includes screenshots or videos if containing UI changes
You've made a self review of your PR

github-actions · 2026-03-09T15:46:13Z

📱 Scan the QR code below to install the build (arm64 only) for this PR.

If you can't scan the QR code you can install the build via this link: https://i.diawi.com/K8HM5t

codecov · 2026-03-09T15:58:21Z

Codecov Report

❌ Patch coverage is 74.46809% with 12 lines in your changes missing coverage. Please review.
✅ Project coverage is 81.26%. Comparing base (861f268) to head (35ae938).
⚠️ Report is 4 commits behind head on develop.

Files with missing lines	Patch %	Lines
...tures/networkmonitor/impl/DefaultNetworkMonitor.kt	0.00%	9 Missing ⚠️
...features/networkmonitor/test/FakeNetworkMonitor.kt	75.00%	1 Missing ⚠️
...kmanager/SyncPendingNotificationsRequestBuilder.kt	95.45%	1 Missing ⚠️
...ager/FakeSyncPendingNotificationsRequestBuilder.kt	50.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #6305      +/-   ##
===========================================
- Coverage    81.27%   81.26%   -0.01%     
===========================================
  Files         2577     2578       +1     
  Lines        70213    70247      +34     
  Branches      9018     9023       +5     
===========================================
+ Hits         57065    57089      +24     
- Misses        9790     9800      +10     
  Partials      3358     3358

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

…tor`

…y its usage

…ent()` since it's an enterprise feature

…raints: Requesting the OS to have internet connectivity before starting a fetch notifications worker. This feature flag is enabled by default, but can be disabled in case it's problematic.

…rvice`, check in `DefaultNetworkMonitor` if the build is enterprise before updating the value.

bmarty

Thanks, only minor remarks and one question

bmarty · 2026-03-10T11:18:54Z

...monitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/NetworkMonitor.kt

+    val isNetworkBlocked: StateFlow<Boolean>
+
+    /**
+    * A flow indicating whether the app is running in an air-gapped environment.


Suggested change

* A flow indicating whether the app is running in an air-gapped environment.

* A flow indicating whether the app is running in an air-gapped environment.

bmarty · 2026-03-10T11:23:28Z

...h/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt

            workManagerScheduler = workManagerScheduler,
-            buildVersionSdkIntProvider = buildVersionSdkIntProvider,
            resultProcessor = resultProcessor,
+            syncPendingNotificationsRequestFactory = object : SyncPendingNotificationsRequestBuilder.Factory {


Maybe create a FakeSyncPendingNotificationsRequestFactory class?

bmarty · 2026-03-10T11:23:47Z

...android/libraries/push/impl/workmanager/DefaultSyncPendingNotificationsRequestBuilderTest.kt

@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.


Agh, this is because the file was renamed although git thinks it's new. I'll change it anyway.

bmarty · 2026-03-10T11:26:22Z

...mpl/src/main/kotlin/io/element/android/features/networkmonitor/impl/DefaultNetworkMonitor.kt


-    override fun isNetworkBlocked(): Boolean = blockedNetworkBlockedChecker.isNetworkBlocked()
+    override val isNetworkBlocked = MutableStateFlow(false)
+    override val isInAirGappedEnvironment = MutableStateFlow(false)


Is it fine to initialize the 2 stateflow with false? Maybe read values as it was done before in NetworkBlockedChecker?

When the app is started, there's no chance network can be blocked by Doze, so isNetworkBlocked will always be false. And for the air-gapped env check we need to receive the callback to actually know what's its status, I think.

When the app is started, there's no chance network can be blocked by Doze

The app can be started by a Push, so are you sure this is true?

Hmm, good call. It should always be exempted from network restrictions in that case, according to the docs but well... we all know how reliable Google docs are 😅 .

That's "true" for Firebase, but not really for UnifiedPush...

24ac364 should fix it

…e` for easily creating fakes Add `FakeSyncPendingNotificationsRequestBuilder`

…onitor.isNetworkBlocked` with its contents We use a separate component to avoid propagating the `@file:Suppress("DEPRECATION")` to the whole `DefaultNetworkMonitor` file

sonarqubecloud · 2026-03-10T12:28:41Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

jmartinesp changed the title ~~misc/check-air-gapped-env-for-workmanager-network-constraints~~ Add network constraints to the workers for fetching notifications Mar 9, 2026

jmartinesp mentioned this pull request Mar 9, 2026

Add network constraint for fetching notifications with WorkManager #6220

Closed

9 tasks

jmartinesp added the PR-Misc For other changes label Mar 9, 2026

jmartinesp changed the title ~~Add network constraints to the workers for fetching notifications~~ Add network constraints for fetching notifications with WorkManager Mar 9, 2026

jmartinesp force-pushed the misc/check-air-gapped-env-for-workmanager-network-constraints branch 2 times, most recently from ad00ef6 to 24fa6b3 Compare March 9, 2026 16:17

jmartinesp marked this pull request as ready for review March 9, 2026 16:19

jmartinesp requested a review from a team as a code owner March 9, 2026 16:19

jmartinesp requested review from bmarty and removed request for a team March 9, 2026 16:19

jmartinesp added 9 commits March 10, 2026 11:27

Add isNetworkBlocked and isInAirGappedEnvironment to `NetworkMoni…

ec96dc7

…tor`

Remove NetworkBlockedChecker

bb6b493

Improve the DI of SyncPendingNotificationsRequestBuilder to simplif…

75bc189

…y its usage

Expose the air-gapped state in `EnterpriseService.isAirGappedEnvironm…

a3133a7

…ent()` since it's an enterprise feature

Add network constraints based on the air-gapped status

dd07d52

Add tests for DefaultSyncPendingNotificationsRequestBuilder

fd043c5

Add a feature flag to disable the problematic part of the added const…

0fcf8d8

…raints: Requesting the OS to have internet connectivity before starting a fetch notifications worker. This feature flag is enabled by default, but can be disabled in case it's problematic.

Simplify checking for air-gapped status: remove it from `EnterpriseSe…

d656afd

…rvice`, check in `DefaultNetworkMonitor` if the build is enterprise before updating the value.

Bump enterprise repo

03595f2

jmartinesp force-pushed the misc/check-air-gapped-env-for-workmanager-network-constraints branch from 144457b to 03595f2 Compare March 10, 2026 10:28

bmarty approved these changes Mar 10, 2026

View reviewed changes

jmartinesp added 4 commits March 10, 2026 13:01

Fix docs and copyright notice

0b63f74

Make SyncPendingNotificationsRequestBuilder.Factory a `fun interfac…

a3afd98

…e` for easily creating fakes Add `FakeSyncPendingNotificationsRequestBuilder`

Restore NetworkBlockedChecker so we can initialize `DefaultNetworkM…

24ac364

…onitor.isNetworkBlocked` with its contents We use a separate component to avoid propagating the `@file:Suppress("DEPRECATION")` to the whole `DefaultNetworkMonitor` file

Bump enterprise repo again

35ae938

jmartinesp enabled auto-merge (squash) March 10, 2026 12:39

jmartinesp merged commit 912b916 into develop Mar 10, 2026
31 of 32 checks passed

jmartinesp deleted the misc/check-air-gapped-env-for-workmanager-network-constraints branch March 10, 2026 12:44

	* A flow indicating whether the app is running in an air-gapped environment.
	* A flow indicating whether the app is running in an air-gapped environment.

Conversation

jmartinesp commented Mar 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Content

Motivation and context

Tests

Tested devices

Checklist

Uh oh!

github-actions bot commented Mar 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Mar 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

bmarty left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Mar 10, 2026

Quality Gate passed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jmartinesp commented Mar 9, 2026 •

edited

Loading

github-actions bot commented Mar 9, 2026 •

edited

Loading

codecov bot commented Mar 9, 2026 •

edited

Loading